project expanded with support for table functionality, restructured