diff --git a/Sparkles/AuthenticationInfo/AuthenticationInfo.cs b/Sparkles/AuthenticationInfo.cs
similarity index 100%
rename from Sparkles/AuthenticationInfo/AuthenticationInfo.cs
rename to Sparkles/AuthenticationInfo.cs
diff --git a/Sparkles/Fetcher/BaseFetcher.cs b/Sparkles/BaseFetcher.cs
similarity index 100%
rename from Sparkles/Fetcher/BaseFetcher.cs
rename to Sparkles/BaseFetcher.cs
diff --git a/Sparkles/Listener/BaseListener.cs b/Sparkles/BaseListener.cs
similarity index 100%
rename from Sparkles/Listener/BaseListener.cs
rename to Sparkles/BaseListener.cs
diff --git a/Sparkles/Repository/BaseRepository.cs b/Sparkles/BaseRepository.cs
similarity index 100%
rename from Sparkles/Repository/BaseRepository.cs
rename to Sparkles/BaseRepository.cs
diff --git a/Sparkles/Repository/ChangeSet.cs b/Sparkles/ChangeSet.cs
similarity index 100%
rename from Sparkles/Repository/ChangeSet.cs
rename to Sparkles/ChangeSet.cs
diff --git a/Sparkles/Listener/ListenerFactory.cs b/Sparkles/ListenerFactory.cs
similarity index 100%
rename from Sparkles/Listener/ListenerFactory.cs
rename to Sparkles/ListenerFactory.cs
diff --git a/Sparkles/AuthenticationInfo/SSHAuthenticationInfo.cs b/Sparkles/SSHAuthenticationInfo.cs
similarity index 100%
rename from Sparkles/AuthenticationInfo/SSHAuthenticationInfo.cs
rename to Sparkles/SSHAuthenticationInfo.cs
diff --git a/Sparkles/Fetcher/SSHFetcher.cs b/Sparkles/SSHFetcher.cs
similarity index 100%
rename from Sparkles/Fetcher/SSHFetcher.cs
rename to Sparkles/SSHFetcher.cs
diff --git a/Sparkles/Listener/TcpListener.cs b/Sparkles/TcpListener.cs
similarity index 100%
rename from Sparkles/Listener/TcpListener.cs
rename to Sparkles/TcpListener.cs
diff --git a/Sparkles/Repository/User.cs b/Sparkles/User.cs
similarity index 100%
rename from Sparkles/Repository/User.cs
rename to Sparkles/User.cs
diff --git a/Sparkles/Repository/Watcher.cs b/Sparkles/Watcher.cs
similarity index 100%
rename from Sparkles/Repository/Watcher.cs
rename to Sparkles/Watcher.cs