Moved some files out of src directory, updated makefile to compile i386 on 64-bit machine