Structuring code (Not compilable commit)