Moved everything to let maven see source code