Shuffling code, so user code can be in a single directory.
Fixed issue with deletion