Renamed directories, fix #2 (test pending)