Reorganized teamplte hiearchy. Cleaned up names and dropped lcdm prefix.