Refactored Files. Added more express integration.