Moved things around to follow ZF structure, added a bunch of todo items