More cleanup.
Adding option block to parser.
Move some files.