Removed Addons from Repo - Refactored into new src-main-java format