Rearranged classes
Starting to implement interactive objects