Restructured highland definitions

Changed pattern to underscore's, added module call tests