code organization
Merge branch 'raysmond'