restructuring
removed some things
finish restructuring