Restructuring directory structure to be cleaner