#ADMIN-8: directory structure changed to the right way
#ADMIN-8: changed arch in 32/