minor Codebase cleanup

Corrected some project file issues and removed some files no longer
needed and organized some files into folders.