Move correct class to correct place... :)