re-organize folders architecture