Moved files to suitable folders

Improved the folder structure to make it clearer.