add javadoc to some classes
add mapped matrix
optimize imports
add aggregate classes