Changed directory structure for easy pull