Reorganised project for Gem creation