Moved package files one level down to better support git modules