Re-organize project folder