Clean up classes into one module - Ducksboard