Some more changes into direction of modules
more changes ..