Code Re-organisation

Segregating data and code as per use cases