Modify Functtional diagram + add javadoc files