new folder object container

added new containers and refractored some stuff and tied some loose ends