Restructured for more clearer code

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/branches/ProjectImporter_8403@993795 13f79535-47bb-0310-9956-ffa450edef68
14 files changed