Forms moved to correct package, loaded templates are ordered - user's templates first then default templates