Deleted old modules/classes structures. OMG, how come I was using one
file with more than 1000 lines and several clasess?