Folder refactoring

Created a more understandable folder structure
and removed unused files.