Fix layout and import
Change to more idiomatic imports