Moving to separate modules directory
Update