Moved the files to lib subfolder