Refactor of file system

Renaming of files and moving classes into appropriate folders.