Initial commit, with all package changes done. No errors or warnings, except for two auto-genereated files (by Javacc).