Reorganised + deleted some stuff