Adds Optimist module and reworks folder setup