rearrange directory structure
successfully merged mvp
timer