Restructuring half way

Creating a better flow between classes.