Split processors into two separate files, further refactor...