renamed dirs, removed reduntant files