restructure directories
renaming module