Removed unneeded TODO's
Moved classes into correct packages