Restructured Github repo