Cleaned file structure up

Hi, I'm interested in your project. I'd like to work with you, please merge my changes if you like them and I'll keep going! ;)