cleaned up folders and made it possible to not have all files in curretn directory