Removed Chibi dir and cleaned up some stuff