add javadoc for main functions

add javadoc for main functions and begin of centralization of management
interventions
fix unmerge paths