Remove old files
Refactor file location, no need for /shell folder