Name files properly
Revamp prompting