Renamed some folders and added some new stuff