Added interfaces for Model. Fixed namespace for new folders.