Finished reorg or backend to modularized format and fixed some of the bugs associated with that