relocate files
resolve merge
fix missing param types
cleanup from config