Re-organize folder sturcture