Added few comments and changed few package structure