Fix build file for shim and new module prefixes
Turn into an Eclipse desktop project