Changed folders and cleaned up my project.

I may have one more commit after this. My project was a mess and I know
I need to do a better job.