WIP
remove Safe
extra source files
version bump