Reorganized classes, debugged some errors with reload