Restructured project and fixed generic property bug
Updates