Module structure adjusted and testing added