Refactoring Srtm classes to objects