Reorganizing sources. Fixed tests
Javadoc fixed