cleaned up compiler/watcher functions. Moved .file check up the stack