Refactored client files to change project layout.