WIP: File cleanup
Code cleanup & add archive feature
Add fix so archive works in directory relative to program