restructured things
more updates