massive restructure of everything