Moved code into own folder
Changed default folder