Organised many classes and started moving code