Restructured project, added models