Spliting the classes into more readable files