restructure first commit
restructured stuff