Updated modules, fixed make file to conform to packaging standards