Refactor to simplify the file structure
Remove unnecessary dependencies