Created new package and moved all java files, we will need that when
testing