Refactored to restructure folders