Moved some classes, fixed some data-loading issues.