Update directory structure
Refactor processor