Modified directories structure, fixed autoload