Restructure, clean-up