changes dir structure and build to be more modular