Added interfaces. Some Project structure changes.