re-organize file-structure