Fixed imports

My IDE was configured to combine imports into an '*' import. Changed
that behaviour and updated imports.