Restructure and add support for application description