Updated application folder structure