Re-org files a bit. Create a new handlers file