Restructured repo to remove intermediate folder