Reworking project. Mor emodular design as per issue.