Moved the library files from the UI to another module and formatted the code
Merge remote-tracking branch 'origin/master'