Rearrenged the files to be more elegant and readable
Removed unused files, they belong in another project.