cleaning up stuff
now with folders! also added shooting