Update module paths
Style updates