Added module naming/placement consistencies