Simplified grammar structure; remove "src" directory and move test to gh-public