Cleaning up imports and structure...