re-doing and reorganizing my repos