Restructured project to shrink dependencies