Added typesafe integration
New project and structure for cleaner presentation