Move to a package dir structure