re-organize files structure