more changes
restructured module