Refactoring: moved files around
Refactoring. ReSharper warnings.