Moved mafcommon files into a more appropriate folder
Removed some medical stuff