Changing project structure to align with Krakenjs