Refactoring name of main package
Added additional infomations