Restructure entities packaging + expand example code