Reorganize and turn into a library
Merge branch 'f/make-library' into develop