Remove folders

remove folders, rename files to use module prefix