Fixed IntelliJ organize Imports
Added imports used by Javadoc