shelled out more stuff

reorganized folders