renamed master file
removing unused classes