Restructuring

Finished restructuring joebot2