Moved files into a package