cleanup & organization to get ready for contributors