Minor changes on source code organization