Moved classes into the right places