Cleaned up parser
Added data directory