Change package name
refactor files
refactor solver