Reorganised packages, added some comments into source code.