moved Templates into appropriate directory, added html test