cleanup and tables.
restructured whole project.