Removed empty folder
Moved classes to correct namespaces
StyleCop & ReSharper