major clean-up / restructure