Changed structure to an addon