Remove generation folder, fix layout