Major reorganization/refactor. Templates loaded differently. Tested up to 4.0RC1