Re-org imports + lint