Added more folders to better separate presentation layer