More project cleanup

Deleted unused files and arranged the project.