Moved some files around and fixed compilation errors.