Adding license and copyright information
clean-up using sonar proposals
removed unused code. moved classes