Moved and renamed package files