Moved data folder and separated filters