WIP modularizing , enforce naming convention
Merge pull request #6 from D10221/dev

WIP modularizing , enforce naming convention