Update project structure. Build out configuration and tests for new functionality