Cleaned up imports, moved them all to header files. Updated git ignore. Got client to maintain mounted state.