Idiomatic restructure and extension [initial commit]