Removed core file and split the parts into their own files