Removed directory structure for easy import to go