Moved script and ER model out of java package