Rearrange directory and files
Apply flat-ui