make modules indepependent and Exceptions