Fix folder structure to align with project

Modified the folder structure to follow the project structure for the most part. The project was in a state of unknown file locations which may have caused it to not function properly.