structure change, fixes for cmake and first builds