Adding directories and cleaning up