refactored directory structure to be closer to google recommendation