Renaming Shape->Area and merging services into a single class