Organize usings (again)