Uppdated folder names and cleaned up some ocde