Migrate to Maven and continue to build out