Commit recent changes, organize imports