Rearranged directories to match sbt structure