Changed structure to fit with typical Julia package structure