Changes to directory structure. Major code sesh.

Major changes. Need to clean up the mess though.