Change the package and some minor arrangement of the file structure