tidying up

Moved packages to root directory and added templates to main package