hunting comment/range location bugs
api refactored: moved model interfaces and classes to corresponding package