Restructured Project reolves #48