cleaned newlines
move files into core