Updated to instance based project structure