Re-factoring: moved all blocks to named 'repositories' and included them