Updated and renamed some stuff