modify folder structure
not ready