* renamed old unit files
+ added first draft of general unit handling