Cleanup initial mess (new handlers folder, deleted old files