Folder restructure. Removed some unused files.