Code Refactored - Unnecessary files where removed