Modify main package name and move files into it