Made some changes so the code compiles. Also changed some directories around.