re-org file structure