fixed some stuff and cleaned up folders