Did some reorganizing
Progress