Refactored
empty folder deleted