Re-organizing imports and switching to absolute imports