20140913: Moved assignments to conform to standard directory strcuture.