Edited some javadoc and change location initial controller