Updated project naming
New project structure
Added measurement macro plus test