Refactored file structure/Cleaned up