Split up some files for easier future management