Created new files to split classes better