Moved SimpleLocation class to own file
Some structure changes