Restructured my repo