- Clean up and re-structure