Feature/cleanup autoload files