Revert "Bareboen project commit"

This reverts commit 79f2e3ada4082cd51bcb09497c40100cdc5c310c.