separated more code into files, worked on tracker
close #27 close#7