Restructured things & added new project