Moving the separate pieces to separte files