Reorganised app directory structure