Rearranged code and commented unused classes