Refactoring
Move everything from main folder.