Clean
Fixed some bugs (added new workspace structure)
a few changes
more changes
more changes on templates files.
clean
changes on templates.