updated to follow athena package structure