bump version
restructure base templates, make it easier to remove stuff