Move files to a package
Convert to relative imports