restructured some directory stuff