Changed structure to make packaging better