Fixed AutoLoad bug and restructured for include/class folders