Updated non folder-specific code and upped version number