Adjust organization of base and about template..