Modified directory structure to better fit convention