Removed old files and renamed some stuff