restructured project layout a tiny bit