Moved to new templates, Mobile SDK 2.0, tidy up