diff --git a/.gitignore b/.gitignore index b0556c0..032eb30 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ target/ hs_err_pid* /*.iml /code_quality_report.txt +/.classpath +/.project +.settings diff --git a/pom.xml b/pom.xml index 1098a2d..64830e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,206 +1,193 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - sharpen - sharpencore - 0.0.1-SNAPSHOT - jar + sharpen + sharpencore + 0.0.1-SNAPSHOT + jar - sharpencore - https://github.com/imazen/sharpen - - Imazen - http://www.imazen.io - - - - GPL 2 - http://www.gnu.org/licenses/gpl-2.0.html - repo - GPL 2 License - - - - - 1 - Nathanael Jones - nathanael.jones@gmail.com - Imazen - http://www.imazen.io - - Architect - Developer - - -5 - - - 2 - Yakov Danilov - yakodani@gmail.com - imazen.io - http://www.imazen.io - - Developer - - +3 - - - - github - https://github.com/imazen/sharpen/issues - - - travis - https://travis-ci.org/imazen/sharpen - - - scm:git:github.com:imazen/sharpen.git - scm:git:github.com:imazen/sharpen.git - https://github.com/imazen/sharpen - - - - - - - - - - - - - - - - + sharpencore + https://github.com/imazen/sharpen + + Imazen + http://www.imazen.io + + + + GPL 2 + http://www.gnu.org/licenses/gpl-2.0.html + repo + GPL 2 License + + + + + 1 + Nathanael Jones + nathanael.jones@gmail.com + Imazen + http://www.imazen.io + + Architect + Developer + + -5 + + + 2 + Yakov Danilov + yakodani@gmail.com + imazen.io + http://www.imazen.io + + Developer + + +3 + + + + github + https://github.com/imazen/sharpen/issues + + + travis + https://travis-ci.org/imazen/sharpen + + + scm:git:github.com:imazen/sharpen.git + scm:git:github.com:imazen/sharpen.git + https://github.com/imazen/sharpen + + + + + + + + + + + + + + + + - - UTF-8 - ${project.artifactId}-${project.version} - + + UTF-8 + ${project.artifactId}-${project.version} + - - - - org.eclipse.jdt - org.eclipse.jdt.core - 3.7.1 - - - org.eclipse.core - runtime - 3.10.0-v20140318-2214 - - - org.eclipse.equinox - common - 3.6.200-v20130402-1505 - - - org.eclipse.osgi - org.eclipse.osgi - 3.6.0.v20100517 - + + + org.eclipse.jdt + org.eclipse.jdt.core + 3.10.0 + + + org.eclipse.tycho + org.eclipse.osgi + 3.10.101.v20150820-1432 + + + junit + junit + 4.11 + test + + - - junit - junit - 4.4 - test - - - - - - src/target - src/target/classes - ${finalName} - src/target/testcases - src/main - src/main/resources - src/test - - - src/test/resources - - - - - src/test/resources - - - - - - - maven-assembly-plugin - - - - sharpen.core.SharpenCmd - - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - + + src/target + src/target/classes + ${finalName} + src/target/testcases + src/main/java + src/main/resources + src/test/java + + + src/test/resources + + + + + src/test/resources + + - - - + - - - - qulice - - - - - com.qulice - qulice-maven-plugin - 0.12 - - - sharpen-check - verify - - check - - - file:${basedir}/LICENSE.txt - - - - - - - - + + maven-assembly-plugin + + + + sharpen.core.SharpenCmd + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + + + + qulice + + + + + com.qulice + qulice-maven-plugin + 0.12 + + + sharpen-check + verify + + check + + + file:${basedir}/LICENSE.txt + + + + + + + + diff --git a/src/main/sharpen/core/AbstractNestedClassBuilder.java b/src/main/java/sharpen/core/AbstractNestedClassBuilder.java similarity index 100% rename from src/main/sharpen/core/AbstractNestedClassBuilder.java rename to src/main/java/sharpen/core/AbstractNestedClassBuilder.java diff --git a/src/main/sharpen/core/Annotations.java b/src/main/java/sharpen/core/Annotations.java similarity index 100% rename from src/main/sharpen/core/Annotations.java rename to src/main/java/sharpen/core/Annotations.java diff --git a/src/main/sharpen/core/Bindings.java b/src/main/java/sharpen/core/Bindings.java similarity index 100% rename from src/main/sharpen/core/Bindings.java rename to src/main/java/sharpen/core/Bindings.java diff --git a/src/main/sharpen/core/CRefBuilder.java b/src/main/java/sharpen/core/CRefBuilder.java similarity index 100% rename from src/main/sharpen/core/CRefBuilder.java rename to src/main/java/sharpen/core/CRefBuilder.java diff --git a/src/main/sharpen/core/CSAnonymousClassBuilder.java b/src/main/java/sharpen/core/CSAnonymousClassBuilder.java similarity index 100% rename from src/main/sharpen/core/CSAnonymousClassBuilder.java rename to src/main/java/sharpen/core/CSAnonymousClassBuilder.java diff --git a/src/main/sharpen/core/CSharpBuilder.java b/src/main/java/sharpen/core/CSharpBuilder.java similarity index 100% rename from src/main/sharpen/core/CSharpBuilder.java rename to src/main/java/sharpen/core/CSharpBuilder.java diff --git a/src/main/sharpen/core/Configuration.java b/src/main/java/sharpen/core/Configuration.java similarity index 100% rename from src/main/sharpen/core/Configuration.java rename to src/main/java/sharpen/core/Configuration.java diff --git a/src/main/sharpen/core/ConfigurationFactory.java b/src/main/java/sharpen/core/ConfigurationFactory.java similarity index 66% rename from src/main/sharpen/core/ConfigurationFactory.java rename to src/main/java/sharpen/core/ConfigurationFactory.java index 82d7e11..6ff3607 100644 --- a/src/main/sharpen/core/ConfigurationFactory.java +++ b/src/main/java/sharpen/core/ConfigurationFactory.java @@ -30,23 +30,26 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; +import java.nio.file.Files; +import java.nio.file.LinkOption; import java.nio.file.Path; import java.nio.file.Paths; public class ConfigurationFactory { public static final String DEFAULT_RUNTIME_TYPE_NAME = "Sharpen.Runtime"; - - private ConfigurationFactory() {} - + + private ConfigurationFactory() { + } + public static Configuration defaultConfiguration() { return newConfiguration(null); } - + public static Configuration newConfiguration(String configurationClass) { return newConfiguration(configurationClass, DEFAULT_RUNTIME_TYPE_NAME); } - + public static Configuration newConfiguration(String configurationClass, String runtimeTypeName) { runtimeTypeName = evalRuntimeType(runtimeTypeName); @@ -59,33 +62,43 @@ public static Configuration newConfiguration(String configurationClass, String r ctor.setAccessible(true); return (Configuration) ctor.newInstance(runtimeTypeName); } catch (Exception e) { - throw new IllegalArgumentException("Cannot instantiate configuration class: " + configurationClass, e); + throw new IllegalArgumentException("Cannot instantiate configuration class: " + configurationClass, e); } } - public static Configuration newExternalConfiguration(String configurationClass, String runtimeTypeName, IProgressMonitor progressMonitor) throws Exception { + public static Configuration newExternalConfiguration(String configurationClass, String runtimeTypeName, + IProgressMonitor progressMonitor) throws Exception { + return newExternalConfiguration(null, configurationClass, runtimeTypeName, progressMonitor); + } + + public static Configuration newExternalConfiguration(String jarPath, String configurationClass, + String runtimeTypeName, IProgressMonitor progressMonitor) throws Exception { if (configurationClass == null) { return null; } runtimeTypeName = evalRuntimeType(runtimeTypeName); - String configJar = NameUtility.unqualify(configurationClass)+ ".sharpenconfig.jar"; - try { - URI currentDirectoryURI = getCurrentDirectoryURI(); - File currentDirectory = new File(currentDirectoryURI); - Path configPath = Paths.get(currentDirectory.getPath(), configJar); - URI jarURI = configPath.toUri(); - File configFile = configPath.toFile(); - if(!configFile.exists()){ - progressMonitor.subTask("Configuration library " + configJar + " not found"); - return null; - } + URI jarURI = null; + + if (jarPath != null && Files.exists(Paths.get(jarPath), LinkOption.NOFOLLOW_LINKS)) { + jarURI = Paths.get(jarPath).toUri(); + } else { + String configJar = NameUtility.unqualify(configurationClass) + ".sharpenconfig.jar"; + URI currentDirectoryURI = getCurrentDirectoryURI(); + File currentDirectory = new File(currentDirectoryURI); + Path configPath = Paths.get(currentDirectory.getPath(), configJar); + jarURI = configPath.toUri(); + File configFile = configPath.toFile(); + if (!configFile.exists()) { + progressMonitor.subTask("Configuration library " + configJar + " not found"); + return null; + } + } return createConfigFromJar(jarURI, configurationClass, runtimeTypeName); - } - catch (Exception ex){ + } catch (Exception ex) { throw new Exception("External configuration library error : " + ex.getMessage(), ex); } } @@ -98,14 +111,16 @@ private static String evalRuntimeType(String runtimeTypeName) { return runtimeTypeName == null ? DEFAULT_RUNTIME_TYPE_NAME : runtimeTypeName; } - private static Configuration createConfigFromJar(URI jarURI, String className, String runtimeTypeName) throws Exception { - URLClassLoader classLoader = new URLClassLoader(new URL[]{ jarURI.toURL() }, ConfigurationFactory.class.getClassLoader()); - Class configurationClass = Class.forName (className, true, classLoader); - if(!Configuration.class.isAssignableFrom(configurationClass)){ + private static Configuration createConfigFromJar(URI jarURI, String className, String runtimeTypeName) + throws Exception { + URLClassLoader classLoader = new URLClassLoader(new URL[] { jarURI.toURL() }, + ConfigurationFactory.class.getClassLoader()); + Class configurationClass = Class.forName(className, true, classLoader); + if (!Configuration.class.isAssignableFrom(configurationClass)) { throw new Exception("Configuration class must extend " + Configuration.class.getName()); } Constructor ctor = configurationClass.getDeclaredConstructor(String.class); - if(!Modifier.isPublic(ctor.getModifiers())){ + if (!Modifier.isPublic(ctor.getModifiers())) { throw new Exception("Configuration class constructor must have public modifier"); } return (Configuration) ctor.newInstance(runtimeTypeName); diff --git a/src/main/sharpen/core/DefaultConfiguration.java b/src/main/java/sharpen/core/DefaultConfiguration.java similarity index 100% rename from src/main/sharpen/core/DefaultConfiguration.java rename to src/main/java/sharpen/core/DefaultConfiguration.java diff --git a/src/main/sharpen/core/DocumentationOverlay.java b/src/main/java/sharpen/core/DocumentationOverlay.java similarity index 100% rename from src/main/sharpen/core/DocumentationOverlay.java rename to src/main/java/sharpen/core/DocumentationOverlay.java diff --git a/src/main/sharpen/core/JavaProjectCmd.java b/src/main/java/sharpen/core/JavaProjectCmd.java similarity index 100% rename from src/main/sharpen/core/JavaProjectCmd.java rename to src/main/java/sharpen/core/JavaProjectCmd.java diff --git a/src/main/sharpen/core/Mappings.java b/src/main/java/sharpen/core/Mappings.java similarity index 100% rename from src/main/sharpen/core/Mappings.java rename to src/main/java/sharpen/core/Mappings.java diff --git a/src/main/sharpen/core/MemberKind.java b/src/main/java/sharpen/core/MemberKind.java similarity index 100% rename from src/main/sharpen/core/MemberKind.java rename to src/main/java/sharpen/core/MemberKind.java diff --git a/src/main/sharpen/core/NameScope.java b/src/main/java/sharpen/core/NameScope.java similarity index 100% rename from src/main/sharpen/core/NameScope.java rename to src/main/java/sharpen/core/NameScope.java diff --git a/src/main/sharpen/core/NamingStrategy.java b/src/main/java/sharpen/core/NamingStrategy.java similarity index 100% rename from src/main/sharpen/core/NamingStrategy.java rename to src/main/java/sharpen/core/NamingStrategy.java diff --git a/src/main/sharpen/core/NonStaticNestedClassBuilder.java b/src/main/java/sharpen/core/NonStaticNestedClassBuilder.java similarity index 100% rename from src/main/sharpen/core/NonStaticNestedClassBuilder.java rename to src/main/java/sharpen/core/NonStaticNestedClassBuilder.java diff --git a/src/main/sharpen/core/NullDocumentationOverlay.java b/src/main/java/sharpen/core/NullDocumentationOverlay.java similarity index 100% rename from src/main/sharpen/core/NullDocumentationOverlay.java rename to src/main/java/sharpen/core/NullDocumentationOverlay.java diff --git a/src/main/sharpen/core/PascalCaseIdentifiersNamingStrategy.java b/src/main/java/sharpen/core/PascalCaseIdentifiersNamingStrategy.java similarity index 100% rename from src/main/sharpen/core/PascalCaseIdentifiersNamingStrategy.java rename to src/main/java/sharpen/core/PascalCaseIdentifiersNamingStrategy.java diff --git a/src/main/sharpen/core/PascalCaseNamingStrategy.java b/src/main/java/sharpen/core/PascalCaseNamingStrategy.java similarity index 100% rename from src/main/sharpen/core/PascalCaseNamingStrategy.java rename to src/main/java/sharpen/core/PascalCaseNamingStrategy.java diff --git a/src/main/sharpen/core/PreserveFullyQualifiedNamesState.java b/src/main/java/sharpen/core/PreserveFullyQualifiedNamesState.java similarity index 100% rename from src/main/sharpen/core/PreserveFullyQualifiedNamesState.java rename to src/main/java/sharpen/core/PreserveFullyQualifiedNamesState.java diff --git a/src/main/sharpen/core/Sharpen.java b/src/main/java/sharpen/core/Sharpen.java similarity index 100% rename from src/main/sharpen/core/Sharpen.java rename to src/main/java/sharpen/core/Sharpen.java diff --git a/src/main/sharpen/core/SharpenAnnotations.java b/src/main/java/sharpen/core/SharpenAnnotations.java similarity index 100% rename from src/main/sharpen/core/SharpenAnnotations.java rename to src/main/java/sharpen/core/SharpenAnnotations.java diff --git a/src/main/sharpen/core/SharpenApplication.java b/src/main/java/sharpen/core/SharpenApplication.java similarity index 92% rename from src/main/sharpen/core/SharpenApplication.java rename to src/main/java/sharpen/core/SharpenApplication.java index aa617ae..28402f5 100644 --- a/src/main/sharpen/core/SharpenApplication.java +++ b/src/main/java/sharpen/core/SharpenApplication.java @@ -40,6 +40,7 @@ public class SharpenApplication { private SharpenCommandLine _args; private static final int HELP_SIZE =27; + private String requestedOutputFolder = null; public void start(String[] args) throws Exception { try { @@ -48,9 +49,17 @@ public void start(String[] args) throws Exception { displayHelp(); return; } + + if(_args.configJarFilePath != null) { + System.err.println("Configuration Jar: " + _args.configJarFilePath); + } + + if(_args.outputFolder != null && !_args.outputFolder.isEmpty()) { + this.requestedOutputFolder = _args.outputFolder; + } System.err.println("Configuration Class: " + _args.configurationClass); System.err.println("Configuration Class: " +_args.runtimeTypeName); - Configuration config = ConfigurationFactory.newExternalConfiguration(_args.configurationClass, _args.runtimeTypeName, newProgressMonitor()); + Configuration config = ConfigurationFactory.newExternalConfiguration(_args.configJarFilePath, _args.configurationClass, _args.runtimeTypeName, newProgressMonitor()); if(config == null) config = ConfigurationFactory.newConfiguration(_args.configurationClass, _args.runtimeTypeName); Sharpen.getDefault().configuration(config); @@ -148,6 +157,11 @@ private void convertTo(JavaProjectCmd project) private String deleteTargetProject(JavaProjectCmd project) throws IOException { String target = project.getProjectPath() + "/" + project.getProjectName() + SharpenConstants.SHARPENED_PROJECT_SUFFIX; + + if(this.requestedOutputFolder != null && !this.requestedOutputFolder.isEmpty()) { + target = requestedOutputFolder; + } + File targetfile = new File(target); if (targetfile.exists()) { delete(targetfile); @@ -221,6 +235,12 @@ private Configuration getConfiguration() throws IOException { ods("Xml documentation: " + _args.xmldoc); configuration.setDocumentationOverlay(new XmlDocumentationOverlay(_args.xmldoc)); } + if (_args.outputFolder != null) { + ods("Output folder: " + _args.outputFolder); + } + if (_args.configJarFilePath != null) { + ods("Specified configuration jar file: " + _args.configJarFilePath); + } configuration.mapEventAdds(_args.eventAddMappings); configuration.mapEvents(_args.eventMappings); configuration.mapNamespaces(_args.namespaceMappings); diff --git a/src/main/sharpen/core/SharpenCmd.java b/src/main/java/sharpen/core/SharpenCmd.java similarity index 100% rename from src/main/sharpen/core/SharpenCmd.java rename to src/main/java/sharpen/core/SharpenCmd.java diff --git a/src/main/sharpen/core/SharpenCommandLine.java b/src/main/java/sharpen/core/SharpenCommandLine.java similarity index 98% rename from src/main/sharpen/core/SharpenCommandLine.java rename to src/main/java/sharpen/core/SharpenCommandLine.java index 645f533..4460ae1 100644 --- a/src/main/sharpen/core/SharpenCommandLine.java +++ b/src/main/java/sharpen/core/SharpenCommandLine.java @@ -86,8 +86,10 @@ public NamingStrategy getNamingStrategy() { public final List eventAddMappings = new ArrayList(); public final Map conditionalCompilation = new HashMap(); public String configurationClass; + public String configJarFilePath; public boolean junitConversion; public boolean flatNamespaceDirectoryStructure; + public String outputFolder; public String sharpenNamespace; public boolean help; } diff --git a/src/main/sharpen/core/SharpenCommandLineParser.java b/src/main/java/sharpen/core/SharpenCommandLineParser.java similarity index 97% rename from src/main/sharpen/core/SharpenCommandLineParser.java rename to src/main/java/sharpen/core/SharpenCommandLineParser.java index 931b1b4..156ba78 100644 --- a/src/main/sharpen/core/SharpenCommandLineParser.java +++ b/src/main/java/sharpen/core/SharpenCommandLineParser.java @@ -144,10 +144,14 @@ protected void processOption(String arg) { _cmdLine.conditionalCompilation.put(consumeNext(), consumeNext()); } else if (areEqual(arg, "-configurationClass")) { _cmdLine.configurationClass = consumeNext(); + } else if (areEqual(arg, "-configJarFilePath")) { + _cmdLine.configJarFilePath = consumeNext(); } else if (areEqual(arg, "-junitConversion")) { _cmdLine.junitConversion = true; } else if (this.areEqual(arg, "-flatDirectoryStructure")) { this._cmdLine.flatNamespaceDirectoryStructure = true; + } else if (this.areEqual(arg, "-outputFolder")) { + this._cmdLine.outputFolder = consumeNext(); } else if (areEqual(arg, "-sharpenNamespace")) { _cmdLine.sharpenNamespace = consumeNext(); } else if (areEqual(arg, "-help")) { diff --git a/src/main/sharpen/core/SharpenConstants.java b/src/main/java/sharpen/core/SharpenConstants.java similarity index 100% rename from src/main/sharpen/core/SharpenConstants.java rename to src/main/java/sharpen/core/SharpenConstants.java diff --git a/src/main/sharpen/core/SharpenConversion.java b/src/main/java/sharpen/core/SharpenConversion.java similarity index 100% rename from src/main/sharpen/core/SharpenConversion.java rename to src/main/java/sharpen/core/SharpenConversion.java diff --git a/src/main/sharpen/core/SharpenConversionBatch.java b/src/main/java/sharpen/core/SharpenConversionBatch.java similarity index 100% rename from src/main/sharpen/core/SharpenConversionBatch.java rename to src/main/java/sharpen/core/SharpenConversionBatch.java diff --git a/src/main/sharpen/core/StandaloneConverter.java b/src/main/java/sharpen/core/StandaloneConverter.java similarity index 100% rename from src/main/sharpen/core/StandaloneConverter.java rename to src/main/java/sharpen/core/StandaloneConverter.java diff --git a/src/main/sharpen/core/VODConfiguration.java b/src/main/java/sharpen/core/VODConfiguration.java similarity index 100% rename from src/main/sharpen/core/VODConfiguration.java rename to src/main/java/sharpen/core/VODConfiguration.java diff --git a/src/main/sharpen/core/WarningHandler.java b/src/main/java/sharpen/core/WarningHandler.java similarity index 100% rename from src/main/sharpen/core/WarningHandler.java rename to src/main/java/sharpen/core/WarningHandler.java diff --git a/src/main/sharpen/core/XmlDocumentationOverlay.java b/src/main/java/sharpen/core/XmlDocumentationOverlay.java similarity index 100% rename from src/main/sharpen/core/XmlDocumentationOverlay.java rename to src/main/java/sharpen/core/XmlDocumentationOverlay.java diff --git a/src/main/sharpen/core/csharp/CSharpPrinter.java b/src/main/java/sharpen/core/csharp/CSharpPrinter.java similarity index 100% rename from src/main/sharpen/core/csharp/CSharpPrinter.java rename to src/main/java/sharpen/core/csharp/CSharpPrinter.java diff --git a/src/main/sharpen/core/csharp/ast/CSAbstractInvocation.java b/src/main/java/sharpen/core/csharp/ast/CSAbstractInvocation.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSAbstractInvocation.java rename to src/main/java/sharpen/core/csharp/ast/CSAbstractInvocation.java diff --git a/src/main/sharpen/core/csharp/ast/CSArrayCreationExpression.java b/src/main/java/sharpen/core/csharp/ast/CSArrayCreationExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSArrayCreationExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSArrayCreationExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSArrayInitializerExpression.java b/src/main/java/sharpen/core/csharp/ast/CSArrayInitializerExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSArrayInitializerExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSArrayInitializerExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSArrayTypeReference.java b/src/main/java/sharpen/core/csharp/ast/CSArrayTypeReference.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSArrayTypeReference.java rename to src/main/java/sharpen/core/csharp/ast/CSArrayTypeReference.java diff --git a/src/main/sharpen/core/csharp/ast/CSAttribute.java b/src/main/java/sharpen/core/csharp/ast/CSAttribute.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSAttribute.java rename to src/main/java/sharpen/core/csharp/ast/CSAttribute.java diff --git a/src/main/sharpen/core/csharp/ast/CSBaseExpression.java b/src/main/java/sharpen/core/csharp/ast/CSBaseExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBaseExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSBaseExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSBlock.java b/src/main/java/sharpen/core/csharp/ast/CSBlock.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBlock.java rename to src/main/java/sharpen/core/csharp/ast/CSBlock.java diff --git a/src/main/sharpen/core/csharp/ast/CSBlockComment.java b/src/main/java/sharpen/core/csharp/ast/CSBlockComment.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBlockComment.java rename to src/main/java/sharpen/core/csharp/ast/CSBlockComment.java diff --git a/src/main/sharpen/core/csharp/ast/CSBlockStatement.java b/src/main/java/sharpen/core/csharp/ast/CSBlockStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBlockStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSBlockStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSBoolLiteralExpression.java b/src/main/java/sharpen/core/csharp/ast/CSBoolLiteralExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBoolLiteralExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSBoolLiteralExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSBreakStatement.java b/src/main/java/sharpen/core/csharp/ast/CSBreakStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSBreakStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSBreakStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSCaseClause.java b/src/main/java/sharpen/core/csharp/ast/CSCaseClause.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSCaseClause.java rename to src/main/java/sharpen/core/csharp/ast/CSCaseClause.java diff --git a/src/main/sharpen/core/csharp/ast/CSCastExpression.java b/src/main/java/sharpen/core/csharp/ast/CSCastExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSCastExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSCastExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSCatchClause.java b/src/main/java/sharpen/core/csharp/ast/CSCatchClause.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSCatchClause.java rename to src/main/java/sharpen/core/csharp/ast/CSCatchClause.java diff --git a/src/main/sharpen/core/csharp/ast/CSCharLiteralExpression.java b/src/main/java/sharpen/core/csharp/ast/CSCharLiteralExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSCharLiteralExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSCharLiteralExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSClass.java b/src/main/java/sharpen/core/csharp/ast/CSClass.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSClass.java rename to src/main/java/sharpen/core/csharp/ast/CSClass.java diff --git a/src/main/sharpen/core/csharp/ast/CSClassModifier.java b/src/main/java/sharpen/core/csharp/ast/CSClassModifier.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSClassModifier.java rename to src/main/java/sharpen/core/csharp/ast/CSClassModifier.java diff --git a/src/main/sharpen/core/csharp/ast/CSComment.java b/src/main/java/sharpen/core/csharp/ast/CSComment.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSComment.java rename to src/main/java/sharpen/core/csharp/ast/CSComment.java diff --git a/src/main/sharpen/core/csharp/ast/CSCompilationUnit.java b/src/main/java/sharpen/core/csharp/ast/CSCompilationUnit.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSCompilationUnit.java rename to src/main/java/sharpen/core/csharp/ast/CSCompilationUnit.java diff --git a/src/main/sharpen/core/csharp/ast/CSConditionalExpression.java b/src/main/java/sharpen/core/csharp/ast/CSConditionalExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSConditionalExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSConditionalExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSConstructor.java b/src/main/java/sharpen/core/csharp/ast/CSConstructor.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSConstructor.java rename to src/main/java/sharpen/core/csharp/ast/CSConstructor.java diff --git a/src/main/sharpen/core/csharp/ast/CSConstructorInvocationExpression.java b/src/main/java/sharpen/core/csharp/ast/CSConstructorInvocationExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSConstructorInvocationExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSConstructorInvocationExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSConstructorModifier.java b/src/main/java/sharpen/core/csharp/ast/CSConstructorModifier.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSConstructorModifier.java rename to src/main/java/sharpen/core/csharp/ast/CSConstructorModifier.java diff --git a/src/main/sharpen/core/csharp/ast/CSContinueStatement.java b/src/main/java/sharpen/core/csharp/ast/CSContinueStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSContinueStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSContinueStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSDeclarationExpression.java b/src/main/java/sharpen/core/csharp/ast/CSDeclarationExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDeclarationExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSDeclarationExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSDeclarationStatement.java b/src/main/java/sharpen/core/csharp/ast/CSDeclarationStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDeclarationStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSDeclarationStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSDelegate.java b/src/main/java/sharpen/core/csharp/ast/CSDelegate.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDelegate.java rename to src/main/java/sharpen/core/csharp/ast/CSDelegate.java diff --git a/src/main/sharpen/core/csharp/ast/CSDestructor.java b/src/main/java/sharpen/core/csharp/ast/CSDestructor.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDestructor.java rename to src/main/java/sharpen/core/csharp/ast/CSDestructor.java diff --git a/src/main/sharpen/core/csharp/ast/CSDoStatement.java b/src/main/java/sharpen/core/csharp/ast/CSDoStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDoStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSDoStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSDocAttributeNode.java b/src/main/java/sharpen/core/csharp/ast/CSDocAttributeNode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDocAttributeNode.java rename to src/main/java/sharpen/core/csharp/ast/CSDocAttributeNode.java diff --git a/src/main/sharpen/core/csharp/ast/CSDocNode.java b/src/main/java/sharpen/core/csharp/ast/CSDocNode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDocNode.java rename to src/main/java/sharpen/core/csharp/ast/CSDocNode.java diff --git a/src/main/sharpen/core/csharp/ast/CSDocTagNode.java b/src/main/java/sharpen/core/csharp/ast/CSDocTagNode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDocTagNode.java rename to src/main/java/sharpen/core/csharp/ast/CSDocTagNode.java diff --git a/src/main/sharpen/core/csharp/ast/CSDocTextNode.java b/src/main/java/sharpen/core/csharp/ast/CSDocTextNode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDocTextNode.java rename to src/main/java/sharpen/core/csharp/ast/CSDocTextNode.java diff --git a/src/main/sharpen/core/csharp/ast/CSDocTextOverlay.java b/src/main/java/sharpen/core/csharp/ast/CSDocTextOverlay.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSDocTextOverlay.java rename to src/main/java/sharpen/core/csharp/ast/CSDocTextOverlay.java diff --git a/src/main/sharpen/core/csharp/ast/CSEnum.java b/src/main/java/sharpen/core/csharp/ast/CSEnum.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSEnum.java rename to src/main/java/sharpen/core/csharp/ast/CSEnum.java diff --git a/src/main/sharpen/core/csharp/ast/CSEnumValue.java b/src/main/java/sharpen/core/csharp/ast/CSEnumValue.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSEnumValue.java rename to src/main/java/sharpen/core/csharp/ast/CSEnumValue.java diff --git a/src/main/sharpen/core/csharp/ast/CSEvent.java b/src/main/java/sharpen/core/csharp/ast/CSEvent.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSEvent.java rename to src/main/java/sharpen/core/csharp/ast/CSEvent.java diff --git a/src/main/sharpen/core/csharp/ast/CSExpression.java b/src/main/java/sharpen/core/csharp/ast/CSExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSExpressionStatement.java b/src/main/java/sharpen/core/csharp/ast/CSExpressionStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSExpressionStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSExpressionStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSExpressionVisitor.java b/src/main/java/sharpen/core/csharp/ast/CSExpressionVisitor.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSExpressionVisitor.java rename to src/main/java/sharpen/core/csharp/ast/CSExpressionVisitor.java diff --git a/src/main/sharpen/core/csharp/ast/CSField.java b/src/main/java/sharpen/core/csharp/ast/CSField.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSField.java rename to src/main/java/sharpen/core/csharp/ast/CSField.java diff --git a/src/main/sharpen/core/csharp/ast/CSFieldModifier.java b/src/main/java/sharpen/core/csharp/ast/CSFieldModifier.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSFieldModifier.java rename to src/main/java/sharpen/core/csharp/ast/CSFieldModifier.java diff --git a/src/main/sharpen/core/csharp/ast/CSForEachStatement.java b/src/main/java/sharpen/core/csharp/ast/CSForEachStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSForEachStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSForEachStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSForStatement.java b/src/main/java/sharpen/core/csharp/ast/CSForStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSForStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSForStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSGotoStatement.java b/src/main/java/sharpen/core/csharp/ast/CSGotoStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSGotoStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSGotoStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSIfStatement.java b/src/main/java/sharpen/core/csharp/ast/CSIfStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSIfStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSIfStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSIndexedExpression.java b/src/main/java/sharpen/core/csharp/ast/CSIndexedExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSIndexedExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSIndexedExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSInfixExpression.java b/src/main/java/sharpen/core/csharp/ast/CSInfixExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSInfixExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSInfixExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSInterface.java b/src/main/java/sharpen/core/csharp/ast/CSInterface.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSInterface.java rename to src/main/java/sharpen/core/csharp/ast/CSInterface.java diff --git a/src/main/sharpen/core/csharp/ast/CSLabelStatement.java b/src/main/java/sharpen/core/csharp/ast/CSLabelStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSLabelStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSLabelStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSLineComment.java b/src/main/java/sharpen/core/csharp/ast/CSLineComment.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSLineComment.java rename to src/main/java/sharpen/core/csharp/ast/CSLineComment.java diff --git a/src/main/sharpen/core/csharp/ast/CSLockStatement.java b/src/main/java/sharpen/core/csharp/ast/CSLockStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSLockStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSLockStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSMacro.java b/src/main/java/sharpen/core/csharp/ast/CSMacro.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMacro.java rename to src/main/java/sharpen/core/csharp/ast/CSMacro.java diff --git a/src/main/sharpen/core/csharp/ast/CSMacroExpression.java b/src/main/java/sharpen/core/csharp/ast/CSMacroExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMacroExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSMacroExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSMacroTypeReference.java b/src/main/java/sharpen/core/csharp/ast/CSMacroTypeReference.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMacroTypeReference.java rename to src/main/java/sharpen/core/csharp/ast/CSMacroTypeReference.java diff --git a/src/main/sharpen/core/csharp/ast/CSMember.java b/src/main/java/sharpen/core/csharp/ast/CSMember.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMember.java rename to src/main/java/sharpen/core/csharp/ast/CSMember.java diff --git a/src/main/sharpen/core/csharp/ast/CSMemberReferenceExpression.java b/src/main/java/sharpen/core/csharp/ast/CSMemberReferenceExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMemberReferenceExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSMemberReferenceExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSMetaMember.java b/src/main/java/sharpen/core/csharp/ast/CSMetaMember.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMetaMember.java rename to src/main/java/sharpen/core/csharp/ast/CSMetaMember.java diff --git a/src/main/sharpen/core/csharp/ast/CSMethod.java b/src/main/java/sharpen/core/csharp/ast/CSMethod.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMethod.java rename to src/main/java/sharpen/core/csharp/ast/CSMethod.java diff --git a/src/main/sharpen/core/csharp/ast/CSMethodBase.java b/src/main/java/sharpen/core/csharp/ast/CSMethodBase.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMethodBase.java rename to src/main/java/sharpen/core/csharp/ast/CSMethodBase.java diff --git a/src/main/sharpen/core/csharp/ast/CSMethodInvocationExpression.java b/src/main/java/sharpen/core/csharp/ast/CSMethodInvocationExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMethodInvocationExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSMethodInvocationExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSMethodModifier.java b/src/main/java/sharpen/core/csharp/ast/CSMethodModifier.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSMethodModifier.java rename to src/main/java/sharpen/core/csharp/ast/CSMethodModifier.java diff --git a/src/main/sharpen/core/csharp/ast/CSNode.java b/src/main/java/sharpen/core/csharp/ast/CSNode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSNode.java rename to src/main/java/sharpen/core/csharp/ast/CSNode.java diff --git a/src/main/sharpen/core/csharp/ast/CSNullLiteralExpression.java b/src/main/java/sharpen/core/csharp/ast/CSNullLiteralExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSNullLiteralExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSNullLiteralExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSNumberLiteralExpression.java b/src/main/java/sharpen/core/csharp/ast/CSNumberLiteralExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSNumberLiteralExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSNumberLiteralExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSParameterized.java b/src/main/java/sharpen/core/csharp/ast/CSParameterized.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSParameterized.java rename to src/main/java/sharpen/core/csharp/ast/CSParameterized.java diff --git a/src/main/sharpen/core/csharp/ast/CSParenthesizedExpression.java b/src/main/java/sharpen/core/csharp/ast/CSParenthesizedExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSParenthesizedExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSParenthesizedExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSPostfixExpression.java b/src/main/java/sharpen/core/csharp/ast/CSPostfixExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSPostfixExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSPostfixExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSPrefixExpression.java b/src/main/java/sharpen/core/csharp/ast/CSPrefixExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSPrefixExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSPrefixExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSProperty.java b/src/main/java/sharpen/core/csharp/ast/CSProperty.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSProperty.java rename to src/main/java/sharpen/core/csharp/ast/CSProperty.java diff --git a/src/main/sharpen/core/csharp/ast/CSReferenceExpression.java b/src/main/java/sharpen/core/csharp/ast/CSReferenceExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSReferenceExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSReferenceExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSRemovedExpression.java b/src/main/java/sharpen/core/csharp/ast/CSRemovedExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSRemovedExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSRemovedExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSReturnStatement.java b/src/main/java/sharpen/core/csharp/ast/CSReturnStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSReturnStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSReturnStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSStatement.java b/src/main/java/sharpen/core/csharp/ast/CSStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSStringLiteralExpression.java b/src/main/java/sharpen/core/csharp/ast/CSStringLiteralExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSStringLiteralExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSStringLiteralExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSStruct.java b/src/main/java/sharpen/core/csharp/ast/CSStruct.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSStruct.java rename to src/main/java/sharpen/core/csharp/ast/CSStruct.java diff --git a/src/main/sharpen/core/csharp/ast/CSSwitchStatement.java b/src/main/java/sharpen/core/csharp/ast/CSSwitchStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSSwitchStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSSwitchStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSThisExpression.java b/src/main/java/sharpen/core/csharp/ast/CSThisExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSThisExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSThisExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSThrowStatement.java b/src/main/java/sharpen/core/csharp/ast/CSThrowStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSThrowStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSThrowStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSTryStatement.java b/src/main/java/sharpen/core/csharp/ast/CSTryStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTryStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSTryStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSType.java b/src/main/java/sharpen/core/csharp/ast/CSType.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSType.java rename to src/main/java/sharpen/core/csharp/ast/CSType.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeArgumentProvider.java b/src/main/java/sharpen/core/csharp/ast/CSTypeArgumentProvider.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeArgumentProvider.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeArgumentProvider.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeArgumentSupport.java b/src/main/java/sharpen/core/csharp/ast/CSTypeArgumentSupport.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeArgumentSupport.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeArgumentSupport.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeDeclaration.java b/src/main/java/sharpen/core/csharp/ast/CSTypeDeclaration.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeDeclaration.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeDeclaration.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeParameter.java b/src/main/java/sharpen/core/csharp/ast/CSTypeParameter.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeParameter.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeParameter.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeParameterProvider.java b/src/main/java/sharpen/core/csharp/ast/CSTypeParameterProvider.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeParameterProvider.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeParameterProvider.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeReference.java b/src/main/java/sharpen/core/csharp/ast/CSTypeReference.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeReference.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeReference.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeReferenceExpression.java b/src/main/java/sharpen/core/csharp/ast/CSTypeReferenceExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeReferenceExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeReferenceExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypedMember.java b/src/main/java/sharpen/core/csharp/ast/CSTypedMember.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypedMember.java rename to src/main/java/sharpen/core/csharp/ast/CSTypedMember.java diff --git a/src/main/sharpen/core/csharp/ast/CSTypeofExpression.java b/src/main/java/sharpen/core/csharp/ast/CSTypeofExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSTypeofExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSTypeofExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSUnaryExpression.java b/src/main/java/sharpen/core/csharp/ast/CSUnaryExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSUnaryExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSUnaryExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSUncheckedExpression.java b/src/main/java/sharpen/core/csharp/ast/CSUncheckedExpression.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSUncheckedExpression.java rename to src/main/java/sharpen/core/csharp/ast/CSUncheckedExpression.java diff --git a/src/main/sharpen/core/csharp/ast/CSUsing.java b/src/main/java/sharpen/core/csharp/ast/CSUsing.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSUsing.java rename to src/main/java/sharpen/core/csharp/ast/CSUsing.java diff --git a/src/main/sharpen/core/csharp/ast/CSUsingStatement.java b/src/main/java/sharpen/core/csharp/ast/CSUsingStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSUsingStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSUsingStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSVariableDeclaration.java b/src/main/java/sharpen/core/csharp/ast/CSVariableDeclaration.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSVariableDeclaration.java rename to src/main/java/sharpen/core/csharp/ast/CSVariableDeclaration.java diff --git a/src/main/sharpen/core/csharp/ast/CSVisibility.java b/src/main/java/sharpen/core/csharp/ast/CSVisibility.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSVisibility.java rename to src/main/java/sharpen/core/csharp/ast/CSVisibility.java diff --git a/src/main/sharpen/core/csharp/ast/CSVisitor.java b/src/main/java/sharpen/core/csharp/ast/CSVisitor.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSVisitor.java rename to src/main/java/sharpen/core/csharp/ast/CSVisitor.java diff --git a/src/main/sharpen/core/csharp/ast/CSWhileStatement.java b/src/main/java/sharpen/core/csharp/ast/CSWhileStatement.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSWhileStatement.java rename to src/main/java/sharpen/core/csharp/ast/CSWhileStatement.java diff --git a/src/main/sharpen/core/csharp/ast/CSharpCode.java b/src/main/java/sharpen/core/csharp/ast/CSharpCode.java similarity index 100% rename from src/main/sharpen/core/csharp/ast/CSharpCode.java rename to src/main/java/sharpen/core/csharp/ast/CSharpCode.java diff --git a/src/main/sharpen/core/framework/ASTResolver.java b/src/main/java/sharpen/core/framework/ASTResolver.java similarity index 100% rename from src/main/sharpen/core/framework/ASTResolver.java rename to src/main/java/sharpen/core/framework/ASTResolver.java diff --git a/src/main/sharpen/core/framework/ASTUtility.java b/src/main/java/sharpen/core/framework/ASTUtility.java similarity index 100% rename from src/main/sharpen/core/framework/ASTUtility.java rename to src/main/java/sharpen/core/framework/ASTUtility.java diff --git a/src/main/sharpen/core/framework/BindingUtils.java b/src/main/java/sharpen/core/framework/BindingUtils.java similarity index 100% rename from src/main/sharpen/core/framework/BindingUtils.java rename to src/main/java/sharpen/core/framework/BindingUtils.java diff --git a/src/main/sharpen/core/framework/ByRef.java b/src/main/java/sharpen/core/framework/ByRef.java similarity index 100% rename from src/main/sharpen/core/framework/ByRef.java rename to src/main/java/sharpen/core/framework/ByRef.java diff --git a/src/main/sharpen/core/framework/CommandLineParser.java b/src/main/java/sharpen/core/framework/CommandLineParser.java similarity index 100% rename from src/main/sharpen/core/framework/CommandLineParser.java rename to src/main/java/sharpen/core/framework/CommandLineParser.java diff --git a/src/main/sharpen/core/framework/CompilationUnitPair.java b/src/main/java/sharpen/core/framework/CompilationUnitPair.java similarity index 100% rename from src/main/sharpen/core/framework/CompilationUnitPair.java rename to src/main/java/sharpen/core/framework/CompilationUnitPair.java diff --git a/src/main/sharpen/core/framework/ConsoleProgressMonitor.java b/src/main/java/sharpen/core/framework/ConsoleProgressMonitor.java similarity index 100% rename from src/main/sharpen/core/framework/ConsoleProgressMonitor.java rename to src/main/java/sharpen/core/framework/ConsoleProgressMonitor.java diff --git a/src/main/sharpen/core/framework/ConversionBatch.java b/src/main/java/sharpen/core/framework/ConversionBatch.java similarity index 100% rename from src/main/sharpen/core/framework/ConversionBatch.java rename to src/main/java/sharpen/core/framework/ConversionBatch.java diff --git a/src/main/sharpen/core/framework/DefaultASTResolver.java b/src/main/java/sharpen/core/framework/DefaultASTResolver.java similarity index 100% rename from src/main/sharpen/core/framework/DefaultASTResolver.java rename to src/main/java/sharpen/core/framework/DefaultASTResolver.java diff --git a/src/main/sharpen/core/framework/DynamicVariable.java b/src/main/java/sharpen/core/framework/DynamicVariable.java similarity index 100% rename from src/main/sharpen/core/framework/DynamicVariable.java rename to src/main/java/sharpen/core/framework/DynamicVariable.java diff --git a/src/main/sharpen/core/framework/Environment.java b/src/main/java/sharpen/core/framework/Environment.java similarity index 100% rename from src/main/sharpen/core/framework/Environment.java rename to src/main/java/sharpen/core/framework/Environment.java diff --git a/src/main/sharpen/core/framework/Environments.java b/src/main/java/sharpen/core/framework/Environments.java similarity index 100% rename from src/main/sharpen/core/framework/Environments.java rename to src/main/java/sharpen/core/framework/Environments.java diff --git a/src/main/sharpen/core/framework/Function.java b/src/main/java/sharpen/core/framework/Function.java similarity index 100% rename from src/main/sharpen/core/framework/Function.java rename to src/main/java/sharpen/core/framework/Function.java diff --git a/src/main/sharpen/core/framework/JavadocUtility.java b/src/main/java/sharpen/core/framework/JavadocUtility.java similarity index 100% rename from src/main/sharpen/core/framework/JavadocUtility.java rename to src/main/java/sharpen/core/framework/JavadocUtility.java diff --git a/src/main/sharpen/core/framework/NameUtility.java b/src/main/java/sharpen/core/framework/NameUtility.java similarity index 100% rename from src/main/sharpen/core/framework/NameUtility.java rename to src/main/java/sharpen/core/framework/NameUtility.java diff --git a/src/main/sharpen/core/framework/Producer.java b/src/main/java/sharpen/core/framework/Producer.java similarity index 100% rename from src/main/sharpen/core/framework/Producer.java rename to src/main/java/sharpen/core/framework/Producer.java diff --git a/src/main/sharpen/core/framework/StaticImports.java b/src/main/java/sharpen/core/framework/StaticImports.java similarity index 100% rename from src/main/sharpen/core/framework/StaticImports.java rename to src/main/java/sharpen/core/framework/StaticImports.java diff --git a/src/main/sharpen/core/framework/Types.java b/src/main/java/sharpen/core/framework/Types.java similarity index 100% rename from src/main/sharpen/core/framework/Types.java rename to src/main/java/sharpen/core/framework/Types.java diff --git a/src/main/sharpen/core/internal/AnnotationsImpl.java b/src/main/java/sharpen/core/internal/AnnotationsImpl.java similarity index 100% rename from src/main/sharpen/core/internal/AnnotationsImpl.java rename to src/main/java/sharpen/core/internal/AnnotationsImpl.java diff --git a/src/main/sharpen/core/internal/BindingsImpl.java b/src/main/java/sharpen/core/internal/BindingsImpl.java similarity index 100% rename from src/main/sharpen/core/internal/BindingsImpl.java rename to src/main/java/sharpen/core/internal/BindingsImpl.java diff --git a/src/main/sharpen/core/internal/MappingsImpl.java b/src/main/java/sharpen/core/internal/MappingsImpl.java similarity index 100% rename from src/main/sharpen/core/internal/MappingsImpl.java rename to src/main/java/sharpen/core/internal/MappingsImpl.java diff --git a/src/main/sharpen/core/internal/NameScopeImpl.java b/src/main/java/sharpen/core/internal/NameScopeImpl.java similarity index 100% rename from src/main/sharpen/core/internal/NameScopeImpl.java rename to src/main/java/sharpen/core/internal/NameScopeImpl.java diff --git a/src/main/sharpen/core/internal/PreserveFullyQualifiedNamesStateImpl.java b/src/main/java/sharpen/core/internal/PreserveFullyQualifiedNamesStateImpl.java similarity index 100% rename from src/main/sharpen/core/internal/PreserveFullyQualifiedNamesStateImpl.java rename to src/main/java/sharpen/core/internal/PreserveFullyQualifiedNamesStateImpl.java diff --git a/src/main/sharpen/core/io/IO.java b/src/main/java/sharpen/core/io/IO.java similarity index 100% rename from src/main/sharpen/core/io/IO.java rename to src/main/java/sharpen/core/io/IO.java diff --git a/src/main/sharpen/core/io/IndentedWriter.java b/src/main/java/sharpen/core/io/IndentedWriter.java similarity index 100% rename from src/main/sharpen/core/io/IndentedWriter.java rename to src/main/java/sharpen/core/io/IndentedWriter.java diff --git a/src/test/sharpen/ui/tests/AbstractConversionTestCase.java b/src/test/java/sharpen/ui/tests/AbstractConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/AbstractConversionTestCase.java rename to src/test/java/sharpen/ui/tests/AbstractConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/AnnotationsTestCase.java b/src/test/java/sharpen/ui/tests/AnnotationsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/AnnotationsTestCase.java rename to src/test/java/sharpen/ui/tests/AnnotationsTestCase.java diff --git a/src/test/sharpen/ui/tests/ArraysTestCase.java b/src/test/java/sharpen/ui/tests/ArraysTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ArraysTestCase.java rename to src/test/java/sharpen/ui/tests/ArraysTestCase.java diff --git a/src/test/sharpen/ui/tests/AttributesTestCase.java b/src/test/java/sharpen/ui/tests/AttributesTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/AttributesTestCase.java rename to src/test/java/sharpen/ui/tests/AttributesTestCase.java diff --git a/src/test/sharpen/ui/tests/AutoCastingTestCase.java b/src/test/java/sharpen/ui/tests/AutoCastingTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/AutoCastingTestCase.java rename to src/test/java/sharpen/ui/tests/AutoCastingTestCase.java diff --git a/src/test/sharpen/ui/tests/BatchConverterTestCase.java b/src/test/java/sharpen/ui/tests/BatchConverterTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/BatchConverterTestCase.java rename to src/test/java/sharpen/ui/tests/BatchConverterTestCase.java diff --git a/src/test/sharpen/ui/tests/BindingTestCaseSubject.java b/src/test/java/sharpen/ui/tests/BindingTestCaseSubject.java similarity index 100% rename from src/test/sharpen/ui/tests/BindingTestCaseSubject.java rename to src/test/java/sharpen/ui/tests/BindingTestCaseSubject.java diff --git a/src/test/sharpen/ui/tests/BlockCommentConversionTestCase.java b/src/test/java/sharpen/ui/tests/BlockCommentConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/BlockCommentConversionTestCase.java rename to src/test/java/sharpen/ui/tests/BlockCommentConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/CollectionConversionTestCase.java b/src/test/java/sharpen/ui/tests/CollectionConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/CollectionConversionTestCase.java rename to src/test/java/sharpen/ui/tests/CollectionConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/CommandLineTestCase.java b/src/test/java/sharpen/ui/tests/CommandLineTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/CommandLineTestCase.java rename to src/test/java/sharpen/ui/tests/CommandLineTestCase.java diff --git a/src/test/sharpen/ui/tests/CommentConversionTestCase.java b/src/test/java/sharpen/ui/tests/CommentConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/CommentConversionTestCase.java rename to src/test/java/sharpen/ui/tests/CommentConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/ConfigurationTestCase.java b/src/test/java/sharpen/ui/tests/ConfigurationTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ConfigurationTestCase.java rename to src/test/java/sharpen/ui/tests/ConfigurationTestCase.java diff --git a/src/test/sharpen/ui/tests/ConstructorsTestCase.java b/src/test/java/sharpen/ui/tests/ConstructorsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ConstructorsTestCase.java rename to src/test/java/sharpen/ui/tests/ConstructorsTestCase.java diff --git a/src/test/sharpen/ui/tests/CustomConfigurationTestCase.java b/src/test/java/sharpen/ui/tests/CustomConfigurationTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/CustomConfigurationTestCase.java rename to src/test/java/sharpen/ui/tests/CustomConfigurationTestCase.java diff --git a/src/test/sharpen/ui/tests/DisableTestCase.java b/src/test/java/sharpen/ui/tests/DisableTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/DisableTestCase.java rename to src/test/java/sharpen/ui/tests/DisableTestCase.java diff --git a/src/test/sharpen/ui/tests/EventConversionTestCase.java b/src/test/java/sharpen/ui/tests/EventConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/EventConversionTestCase.java rename to src/test/java/sharpen/ui/tests/EventConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/GenericsTestCase.java b/src/test/java/sharpen/ui/tests/GenericsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/GenericsTestCase.java rename to src/test/java/sharpen/ui/tests/GenericsTestCase.java diff --git a/src/test/sharpen/ui/tests/IOTestCase.java b/src/test/java/sharpen/ui/tests/IOTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/IOTestCase.java rename to src/test/java/sharpen/ui/tests/IOTestCase.java diff --git a/src/test/sharpen/ui/tests/IgnoreAnnotationsTestCase.java b/src/test/java/sharpen/ui/tests/IgnoreAnnotationsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/IgnoreAnnotationsTestCase.java rename to src/test/java/sharpen/ui/tests/IgnoreAnnotationsTestCase.java diff --git a/src/test/sharpen/ui/tests/ImportsTestCase.java b/src/test/java/sharpen/ui/tests/ImportsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ImportsTestCase.java rename to src/test/java/sharpen/ui/tests/ImportsTestCase.java diff --git a/src/test/sharpen/ui/tests/InnerClassesTestCase.java b/src/test/java/sharpen/ui/tests/InnerClassesTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/InnerClassesTestCase.java rename to src/test/java/sharpen/ui/tests/InnerClassesTestCase.java diff --git a/src/test/sharpen/ui/tests/IntegrationTestCase.java b/src/test/java/sharpen/ui/tests/IntegrationTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/IntegrationTestCase.java rename to src/test/java/sharpen/ui/tests/IntegrationTestCase.java diff --git a/src/test/sharpen/ui/tests/JarUtilities.java b/src/test/java/sharpen/ui/tests/JarUtilities.java similarity index 100% rename from src/test/sharpen/ui/tests/JarUtilities.java rename to src/test/java/sharpen/ui/tests/JarUtilities.java diff --git a/src/test/sharpen/ui/tests/JavadocTestCase.java b/src/test/java/sharpen/ui/tests/JavadocTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/JavadocTestCase.java rename to src/test/java/sharpen/ui/tests/JavadocTestCase.java diff --git a/src/test/sharpen/ui/tests/LabelsTestCase.java b/src/test/java/sharpen/ui/tests/LabelsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/LabelsTestCase.java rename to src/test/java/sharpen/ui/tests/LabelsTestCase.java diff --git a/src/test/sharpen/ui/tests/MacroConversionTestCase.java b/src/test/java/sharpen/ui/tests/MacroConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/MacroConversionTestCase.java rename to src/test/java/sharpen/ui/tests/MacroConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/MappingsTestCase.java b/src/test/java/sharpen/ui/tests/MappingsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/MappingsTestCase.java rename to src/test/java/sharpen/ui/tests/MappingsTestCase.java diff --git a/src/test/sharpen/ui/tests/ModifiersTestCase.java b/src/test/java/sharpen/ui/tests/ModifiersTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ModifiersTestCase.java rename to src/test/java/sharpen/ui/tests/ModifiersTestCase.java diff --git a/src/test/sharpen/ui/tests/NamespaceMappingTestCase.java b/src/test/java/sharpen/ui/tests/NamespaceMappingTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/NamespaceMappingTestCase.java rename to src/test/java/sharpen/ui/tests/NamespaceMappingTestCase.java diff --git a/src/test/sharpen/ui/tests/NativeInterfacesTestCase.java b/src/test/java/sharpen/ui/tests/NativeInterfacesTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/NativeInterfacesTestCase.java rename to src/test/java/sharpen/ui/tests/NativeInterfacesTestCase.java diff --git a/src/test/sharpen/ui/tests/NativeTypeSystemTestCase.java b/src/test/java/sharpen/ui/tests/NativeTypeSystemTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/NativeTypeSystemTestCase.java rename to src/test/java/sharpen/ui/tests/NativeTypeSystemTestCase.java diff --git a/src/test/sharpen/ui/tests/OrganizeUsingsTestCase.java b/src/test/java/sharpen/ui/tests/OrganizeUsingsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/OrganizeUsingsTestCase.java rename to src/test/java/sharpen/ui/tests/OrganizeUsingsTestCase.java diff --git a/src/test/sharpen/ui/tests/ProblemsOutputTestCase.java b/src/test/java/sharpen/ui/tests/ProblemsOutputTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ProblemsOutputTestCase.java rename to src/test/java/sharpen/ui/tests/ProblemsOutputTestCase.java diff --git a/src/test/sharpen/ui/tests/PropertyConversionTestCase.java b/src/test/java/sharpen/ui/tests/PropertyConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/PropertyConversionTestCase.java rename to src/test/java/sharpen/ui/tests/PropertyConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/RemoveTestCase.java b/src/test/java/sharpen/ui/tests/RemoveTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/RemoveTestCase.java rename to src/test/java/sharpen/ui/tests/RemoveTestCase.java diff --git a/src/test/sharpen/ui/tests/RenamingConversionsTestCase.java b/src/test/java/sharpen/ui/tests/RenamingConversionsTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/RenamingConversionsTestCase.java rename to src/test/java/sharpen/ui/tests/RenamingConversionsTestCase.java diff --git a/src/test/sharpen/ui/tests/ReplaceTestCase.java b/src/test/java/sharpen/ui/tests/ReplaceTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/ReplaceTestCase.java rename to src/test/java/sharpen/ui/tests/ReplaceTestCase.java diff --git a/src/test/sharpen/ui/tests/ResourceUtility.java b/src/test/java/sharpen/ui/tests/ResourceUtility.java similarity index 100% rename from src/test/sharpen/ui/tests/ResourceUtility.java rename to src/test/java/sharpen/ui/tests/ResourceUtility.java diff --git a/src/test/sharpen/ui/tests/SharpenCommandLineTestCase.java b/src/test/java/sharpen/ui/tests/SharpenCommandLineTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/SharpenCommandLineTestCase.java rename to src/test/java/sharpen/ui/tests/SharpenCommandLineTestCase.java diff --git a/src/test/sharpen/ui/tests/StringAssert.java b/src/test/java/sharpen/ui/tests/StringAssert.java similarity index 100% rename from src/test/sharpen/ui/tests/StringAssert.java rename to src/test/java/sharpen/ui/tests/StringAssert.java diff --git a/src/test/sharpen/ui/tests/TestCaseResource.java b/src/test/java/sharpen/ui/tests/TestCaseResource.java similarity index 100% rename from src/test/sharpen/ui/tests/TestCaseResource.java rename to src/test/java/sharpen/ui/tests/TestCaseResource.java diff --git a/src/test/sharpen/ui/tests/UnclassifiedConversionTestCase.java b/src/test/java/sharpen/ui/tests/UnclassifiedConversionTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/UnclassifiedConversionTestCase.java rename to src/test/java/sharpen/ui/tests/UnclassifiedConversionTestCase.java diff --git a/src/test/sharpen/ui/tests/UnwrapTestCase.java b/src/test/java/sharpen/ui/tests/UnwrapTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/UnwrapTestCase.java rename to src/test/java/sharpen/ui/tests/UnwrapTestCase.java diff --git a/src/test/sharpen/ui/tests/VisibilityTestCase.java b/src/test/java/sharpen/ui/tests/VisibilityTestCase.java similarity index 100% rename from src/test/sharpen/ui/tests/VisibilityTestCase.java rename to src/test/java/sharpen/ui/tests/VisibilityTestCase.java diff --git a/src/test/sharpen/ui/tests/configuration/CustomConfiguration.java b/src/test/java/sharpen/ui/tests/configuration/CustomConfiguration.java similarity index 100% rename from src/test/sharpen/ui/tests/configuration/CustomConfiguration.java rename to src/test/java/sharpen/ui/tests/configuration/CustomConfiguration.java diff --git a/src/test/sharpen/util/InputStreamUtility.java b/src/test/java/sharpen/util/InputStreamUtility.java similarity index 100% rename from src/test/sharpen/util/InputStreamUtility.java rename to src/test/java/sharpen/util/InputStreamUtility.java diff --git a/src/test/sharpen/util/ResourceLoader.java b/src/test/java/sharpen/util/ResourceLoader.java similarity index 100% rename from src/test/sharpen/util/ResourceLoader.java rename to src/test/java/sharpen/util/ResourceLoader.java