Fixed bug, started reorganizing