Continue separating into specific files