reorganize folders to build a package