* Project and code re-factor

Unnecessary project reference is removed