Table task
clean up
Total project structure changes