Attempt at Modularization v1

Please check if okay. Feeling ko hindi :))