Added test project and restructured Models