Moved directories

Refactoring