Re-organize files
Default update method