Revert "Fix import order in current source code files."

This reverts commit b106079b2d4c304d2f5c7826029e5b3429a41a3c.
Don't add <p/> to empty lines.
Fix import order and some lines over the limit.