Improved the structure of codebase and updated files code accordingly. f39814a Sahil Garg commited on Aug 15