renamed folder and cleaned up hooks