re-organize project folder structure