various updates and restructure