Move Serenity to new package