Reorganized Unit Location so that it was better object oriented programming