reorganize models, update force finding class