Cleanup, use 'lib', fixed only loading when downloaded.