Restructuring into new library
New working example