Cleaned up project file directory into appropriate groups