Adding/correcting javadoc + corrections + changes

Adding preliminary support of Window and UI
Correcting import changes due tu package reorganisation
Minor fixes