Reorganise app directory structure