Finished structure changes...

made progress with the proximity detector, will start work on GUI and
further properties "soon"