Dev

This is the refactoring of master branch