Make sure things work *before* commit...

Fixed syntax errors and forgotten directory of source code