Cleaned up folder names to be less redundant.  That was mainly to help manage larger Eclipse workspaces.  IntelliJ makes that less desirable.