Further cleanups, removed view directory