Update directory structure

I'm just adusting the directory structure to match against conventional structures for projects.