renamed and removed APP_PATH