added more gates and restructured project