WIP: Convert to ProjectScaffold

Please don't merge yet