Switched to Serenity
Update build process to Serenity