* Restructured library and template application
* Updated libraries