Progress on modular boilerplate
Merge pull request #2 from s-timofte/progress

Progress on modular boilerplate