separated classes into files, added methods