Changed folder struckture for NPL-Data