Adding first resources, cleaning up dirnames