Fix #11: Some restructuring, add files to dist