restructured code and release 2.1.0