Massive reorganization, nearly everything has moved, much cleaner