some refactoring on package naming
added structure for graph analysis