Refactored distance between out into the core namespace
Undid re-factor it didn't make any sense
Refactoring the calculations file
Refactored and cleaned the code