Start to clean up build process and make it happen at app build time