Moved require into libs, removed some files