moved directories around to make it less confusing