Refactoring some .xml filenames and creating some new packages on src.