Moved the files into src package