new branch and chages
classes cleaned and organized