Updated directory structure. General updates/bugfixes.