restructuring
further restructuring with blueprints
Merge branch 'tags'