Move Serenity-classes to their own package