commited to current changes structure
corrected the structure of module