Refactory Commit

Refactored code and made new folders for images.