Moved classes to correct packages. + Flour