Made it more reflexible, removed hardcoded folder names