Update Code Organization