refactor core classes
Merge pull request #3 from ycodeteam/refactor_core

refactor core classes