Refactored files, defined grammar, and added weak prefix nick test