Fix some things, reorded the res subdirectories remove some useless files