Changed the directory structure again. This one should be easier to manage.