More migration to Serenity namespace

Commits say it all