Keep package name + directory structure consistent (#354)

* Keep package name + directory structure consistent

This annoyed me so heres a PR

* fix InferReadWrite references

* delete .ConvertFixedToSInt.scala.swo

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/scala/firrtl/ExecutionOptionsManager.scala b/src/main/scala/firrtl/ExecutionOptionsManager.scala
index ff725e30..e4954610 100644
--- a/src/main/scala/firrtl/ExecutionOptionsManager.scala
+++ b/src/main/scala/firrtl/ExecutionOptionsManager.scala
@@ -4,7 +4,7 @@ package firrtl
 
 import firrtl.Annotations._
 import firrtl.Parser._
-import firrtl.passes.memlib.ReplSeqMemAnnotation
+import firrtl.passes.memlib.{InferReadWriteAnnotation, ReplSeqMemAnnotation}
 import logger.LogLevel
 import scopt.OptionParser
 
@@ -267,7 +267,7 @@ trait HasFirrtlOptions {
     .valueName ("<circuit>")
     .foreach { x =>
       firrtlOptions = firrtlOptions.copy(
-        annotations = firrtlOptions.annotations :+ passes.InferReadWriteAnnotation(x, TransID(-1))
+        annotations = firrtlOptions.annotations :+ InferReadWriteAnnotation(x, TransID(-1))
       )
     }.text {
       "Enable readwrite port inference for the target circuit"