Re-did file structure
Refactored code to use component pattern