Restructured project with a better idea in mind.