Changed folder structure, removed unused files and cleaned some code