Code Organization

Code organization efforts