Changed directory structure to more unix-like