Updated directory structure and java packages...