Initial configuration and updated scaffolding - first commit