Renamed directories + improvements