'app' folder structure changed. Enhancement #4