Remove and add proper files
Fix/change many things