Restructured project layout to be cleaner when additional AddOns APIs are added.