Restructured library and demo projects