reorganize the structure

upgraded folder structure