Moved different classes to the correct libraries to be interfaced by.