Refactored Azimuth project