restructure, updates, fixes