[silviu] moved files to a package for each module