Re-ordered some imports and added deps