Cleaned up directory structure - more intune with java.