converting files to a more modular class based structure.
working more on classes